From 3716f9ba7bb670873ecb572f343aabcb77b9a9e0 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Fri, 28 Oct 2005 17:51:37 +0100 Subject: [PATCH] Remove next_io_page field from domain structure. Signed-off-by: Keir Fraser --- xen/arch/x86/domain_build.c | 10 +++------- xen/include/xen/sched.h | 1 - 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/domain_build.c b/xen/arch/x86/domain_build.c index 7d995b157d..802a253828 100644 --- a/xen/arch/x86/domain_build.c +++ b/xen/arch/x86/domain_build.c @@ -583,21 +583,17 @@ int construct_dom0(struct domain *d, _initrd_start, (_initrd_start+initrd_len+PAGE_SIZE-1) & PAGE_MASK); } - d->next_io_page = max_page; - /* Set up start info area. */ si = (start_info_t *)vstartinfo_start; memset(si, 0, PAGE_SIZE); si->nr_pages = nr_pages; + si->shared_info = virt_to_phys(d->shared_info); if ( opt_dom0_translate ) { - si->shared_info = d->next_io_page << PAGE_SHIFT; - set_pfn_from_mfn(virt_to_phys(d->shared_info) >> PAGE_SHIFT, d->next_io_page); - d->next_io_page++; + si->shared_info = max_page << PAGE_SHIFT; + set_pfn_from_mfn(virt_to_phys(d->shared_info) >> PAGE_SHIFT, max_page); } - else - si->shared_info = virt_to_phys(d->shared_info); si->flags = SIF_PRIVILEGED | SIF_INITDOMAIN; si->pt_base = vpt_start; diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 0f012456af..f2270f74c0 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -101,7 +101,6 @@ struct domain struct list_head xenpage_list; /* linked list, of size xenheap_pages */ unsigned int tot_pages; /* number of pages currently possesed */ unsigned int max_pages; /* maximum value for tot_pages */ - unsigned int next_io_page; /* next io pfn to give to domain */ unsigned int xenheap_pages; /* # pages allocated from Xen heap */ /* Scheduling. */ -- 2.30.2